From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 8 Apr 2009 13:43:12 +0000 (+0100)
Subject: x86 hvm: Remove the extra IS_PRIV_FOR() checks I added to do_hvm_op().
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13988^2~12
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=75c3d290f10b1b82bdec72ea803f76d22c4d4e8e;p=xen.git

x86 hvm: Remove the extra IS_PRIV_FOR() checks I added to do_hvm_op().
Actually this is already done by rcu_lock_target_domain_by_id(). Oops.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index b8b1579041..82b99ab761 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -2439,10 +2439,6 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
         if ( rc != 0 )
             return rc;
 
-        rc = -EPERM;
-        if ( (curr_d != d) && !IS_PRIV_FOR(curr_d, d) )
-            goto param_fail;
-
         rc = -EINVAL;
         if ( !is_hvm_domain(d) )
             goto param_fail;
@@ -2621,10 +2617,6 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
         if ( rc != 0 )
             return rc;
 
-        rc = -EPERM;
-        if ( !IS_PRIV_FOR(curr_d, d) )
-            goto param_fail2;
-
         rc = -EINVAL;
         if ( !is_hvm_domain(d) )
             goto param_fail2;
@@ -2663,10 +2655,6 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
         if ( rc != 0 )
             return rc;
 
-        rc = -EPERM;
-        if ( !IS_PRIV_FOR(curr_d, d) )
-            goto param_fail3;
-
         rc = -EINVAL;
         if ( !is_hvm_domain(d) )
             goto param_fail3;
@@ -2723,10 +2711,6 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
         if ( rc != 0 )
             return rc;
 
-        rc = -EPERM;
-        if ( !IS_PRIV_FOR(curr_d, d) )
-            goto param_fail4;
-
         rc = -EINVAL;
         if ( !is_hvm_domain(d) )
             goto param_fail4;